Autogenerated HTML docs for v1.5.3.5-561-g140d
diff --git a/RelNotes-1.5.3.5.txt b/RelNotes-1.5.3.5.txt index 4e46d2c..f99a2cd 100644 --- a/RelNotes-1.5.3.5.txt +++ b/RelNotes-1.5.3.5.txt
@@ -63,8 +63,8 @@ * Git segfaulted when reading an invalid .gitattributes file. Fixed. - * post-receive-email example hook fixed was fixed for - non-fast-forward updates. + * post-receive-email example hook was fixed for non-fast-forward + updates. * Documentation updates for supported (but previously undocumented) options of "git-archive" and "git-reflog".
diff --git a/config.txt b/config.txt index edf50cd..0df004e 100644 --- a/config.txt +++ b/config.txt
@@ -661,6 +661,15 @@ machines. The required amount of memory for the delta search window is however multiplied by the number of threads. +pack.indexVersion:: + Specify the default pack index version. Valid values are 1 for + legacy pack index used by Git versions prior to 1.5.2, and 2 for + the new pack index with capabilities for packs larger than 4 GB + as well as proper protection against the repacking of corrupted + packs. Version 2 is selected and this config option ignored + whenever the corresponding pack is larger than 2 GB. Otherwise + the default is 1. + pull.octopus:: The default merge strategy to use when pulling multiple branches at once.
diff --git a/git-cherry-pick.html b/git-cherry-pick.html index 3e51049..1aee1b0 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html
@@ -272,7 +272,7 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git-cherry-pick</em> [--edit] [-n] [-x] <commit></p> +<p><em>git-cherry-pick</em> [--edit] [-n] [-m parent-number] [-x] <commit></p> </div> <h2>DESCRIPTION</h2> <div class="sectionbody"> @@ -331,6 +331,18 @@ </p> </dd> <dt> +-m parent-number|--mainline parent-number +</dt> +<dd> +<p> + Usually you cannot revert a merge because you do not know which + side of the merge should be considered the mainline. This + option specifies the parent number (starting from 1) of + the mainline and allows cherry-pick to replay the change + relative to the specified parent. +</p> +</dd> +<dt> -n|--no-commit </dt> <dd> @@ -363,7 +375,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 23-Oct-2007 01:21:45 UTC +Last updated 04-Nov-2007 11:13:00 UTC </div> </div> </body>
diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt index 76a2edf..937c4a7 100644 --- a/git-cherry-pick.txt +++ b/git-cherry-pick.txt
@@ -7,7 +7,7 @@ SYNOPSIS -------- -'git-cherry-pick' [--edit] [-n] [-x] <commit> +'git-cherry-pick' [--edit] [-n] [-m parent-number] [-x] <commit> DESCRIPTION ----------- @@ -44,6 +44,13 @@ described above, and `-r` was to disable it. Now the default is not to do `-x` so this option is a no-op. +-m parent-number|--mainline parent-number:: + Usually you cannot revert a merge because you do not know which + side of the merge should be considered the mainline. This + option specifies the parent number (starting from 1) of + the mainline and allows cherry-pick to replay the change + relative to the specified parent. + -n|--no-commit:: Usually the command automatically creates a commit with a commit log message stating which commit was
diff --git a/git-clone.html b/git-clone.html index 5305119..2ee6ec2 100644 --- a/git-clone.html +++ b/git-clone.html
@@ -276,7 +276,7 @@ <div class="content"><em>git-clone</em> [--template=<template_directory>] [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [-o <name>] [-u <upload-pack>] [--reference <repository>] - [--depth <depth>] <repository> [<directory>]</div></div> + [--depth <depth>] [--] <repository> [<directory>]</div></div> </div> <h2>DESCRIPTION</h2> <div class="sectionbody"> @@ -641,7 +641,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Nov-2007 02:47:20 UTC +Last updated 04-Nov-2007 11:13:00 UTC </div> </div> </body>
diff --git a/git-clone.txt b/git-clone.txt index cca14d6..14e58f3 100644 --- a/git-clone.txt +++ b/git-clone.txt
@@ -12,7 +12,7 @@ 'git-clone' [--template=<template_directory>] [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [-o <name>] [-u <upload-pack>] [--reference <repository>] - [--depth <depth>] <repository> [<directory>] + [--depth <depth>] [--] <repository> [<directory>] DESCRIPTION -----------
diff --git a/git-config.html b/git-config.html index b57444b..662d724 100644 --- a/git-config.html +++ b/git-config.html
@@ -1715,6 +1715,20 @@ </p> </dd> <dt> +pack.indexVersion +</dt> +<dd> +<p> + Specify the default pack index version. Valid values are 1 for + legacy pack index used by Git versions prior to 1.5.2, and 2 for + the new pack index with capabilities for packs larger than 4 GB + as well as proper protection against the repacking of corrupted + packs. Version 2 is selected and this config option ignored + whenever the corresponding pack is larger than 2 GB. Otherwise + the default is 1. +</p> +</dd> +<dt> pull.octopus </dt> <dd> @@ -1942,7 +1956,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 25-Oct-2007 06:49:38 UTC +Last updated 04-Nov-2007 11:13:00 UTC </div> </div> </body>
diff --git a/git-revert.html b/git-revert.html index 6bd6c71..56562a3 100644 --- a/git-revert.html +++ b/git-revert.html
@@ -272,7 +272,7 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git-revert</em> [--edit | --no-edit] [-n] <commit></p> +<p><em>git-revert</em> [--edit | --no-edit] [-n] [-m parent-number] <commit></p> </div> <h2>DESCRIPTION</h2> <div class="sectionbody"> @@ -304,6 +304,18 @@ </p> </dd> <dt> +-m parent-number|--mainline parent-number +</dt> +<dd> +<p> + Usually you cannot revert a merge because you do not know which + side of the merge should be considered the mainline. This + option specifies the parent number (starting from 1) of + the mainline and allows revert to reverse the change + relative to the specified parent. +</p> +</dd> +<dt> --no-edit </dt> <dd> @@ -345,7 +357,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 19-Jul-2007 02:09:53 UTC +Last updated 04-Nov-2007 11:13:00 UTC </div> </div> </body>
diff --git a/git-revert.txt b/git-revert.txt index 69db498..3457c40 100644 --- a/git-revert.txt +++ b/git-revert.txt
@@ -7,7 +7,7 @@ SYNOPSIS -------- -'git-revert' [--edit | --no-edit] [-n] <commit> +'git-revert' [--edit | --no-edit] [-n] [-m parent-number] <commit> DESCRIPTION ----------- @@ -27,6 +27,13 @@ message prior committing the revert. This is the default if you run the command from a terminal. +-m parent-number|--mainline parent-number:: + Usually you cannot revert a merge because you do not know which + side of the merge should be considered the mainline. This + option specifies the parent number (starting from 1) of + the mainline and allows revert to reverse the change + relative to the specified parent. + --no-edit:: With this option, `git-revert` will not start the commit message editor.
